(outline-end-of-subtree): Don't leave an empty

line hidden as we would a real next heading.

diff --git a/lisp/outline.el b/lisp/outline.el
index 0cd6eaa718665a17d7e76adad3d809865bb11449..0ec527060a16d327214f677dae827e405a3d58fd 100644 (file)
--- a/lisp/outline.el
+++ b/lisp/outline.el
@@ -894,7 +894,8 @@ Show the heading too, if it is currently invisible."
                (or first (> (funcall outline-level) level)))
       (setq first nil)
       (outline-next-heading))
-    (if (bolp)
+    (if (and (bolp) (not (eolp)))
+       ;; We stopped at a nonempty line (the next heading).
        (progn
          ;; Go to end of line before heading
          (forward-char -1)